Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 18 May 2010 11:35:42 +0000 (11:35 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 18 May 2010 11:35:42 +0000 (11:35 +0000)

Trivial merge